1 files changed, 47 insertions, 30 deletions

diff --git a/src/core/hle/service/vi/application_display_service.h b/src/core/hle/service/vi/application_display_service.h
index 51ae2c472..5dff4bb31 100644
--- a/src/core/hle/service/vi/application_display_service.h
+++ b/src/core/hle/service/vi/application_display_service.h
@@ -1,48 +1,65 @@
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
+#include "core/hle/service/cmif_types.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/vi/vi_types.h"
 
+namespace Kernel {
+class KReadableEvent;
+}
+
 namespace Service::VI {
 
+class IHOSBinderDriver;
+class IManagerDisplayService;
+class ISystemDisplayService;
+
 class IApplicationDisplayService final : public ServiceFramework<IApplicationDisplayService> {
 public:
-    IApplicationDisplayService(Core::System& system_, Nvnflinger::Nvnflinger& nvnflinger_,
-                               Nvnflinger::HosBinderDriverServer& hos_binder_driver_server_);
+    IApplicationDisplayService(Core::System& system_, Nvnflinger::Nvnflinger& nvnflinger,
+                               Nvnflinger::HosBinderDriverServer& hos_binder_driver_server);
     ~IApplicationDisplayService() override;
 
 private:
-    void GetRelayService(HLERequestContext& ctx);
-    void GetSystemDisplayService(HLERequestContext& ctx);
-    void GetManagerDisplayService(HLERequestContext& ctx);
-    void GetIndirectDisplayTransactionService(HLERequestContext& ctx);
-    void OpenDisplay(HLERequestContext& ctx);
-    void OpenDefaultDisplay(HLERequestContext& ctx);
-    void OpenDisplayImpl(HLERequestContext& ctx, std::string_view name);
-    void CloseDisplay(HLERequestContext& ctx);
-    void SetDisplayEnabled(HLERequestContext& ctx);
-    void GetDisplayResolution(HLERequestContext& ctx);
-    void SetLayerScalingMode(HLERequestContext& ctx);
-    void ListDisplays(HLERequestContext& ctx);
-    void OpenLayer(HLERequestContext& ctx);
-    void CloseLayer(HLERequestContext& ctx);
-    void CreateStrayLayer(HLERequestContext& ctx);
-    void DestroyStrayLayer(HLERequestContext& ctx);
-    void GetDisplayVsyncEvent(HLERequestContext& ctx);
-    void ConvertScalingMode(HLERequestContext& ctx);
-    void GetIndirectLayerImageMap(HLERequestContext& ctx);
-    void GetIndirectLayerImageRequiredMemoryInfo(HLERequestContext& ctx);
-
-private:
-    static Result ConvertScalingModeImpl(ConvertedScaleMode* out_scaling_mode,
-                                         NintendoScaleMode mode);
+    Result GetRelayService(Out<SharedPointer<IHOSBinderDriver>> out_relay_service);
+    Result GetSystemDisplayService(
+        Out<SharedPointer<ISystemDisplayService>> out_system_display_service);
+    Result GetManagerDisplayService(
+        Out<SharedPointer<IManagerDisplayService>> out_manager_display_service);
+    Result GetIndirectDisplayTransactionService(
+        Out<SharedPointer<IHOSBinderDriver>> out_indirect_display_transaction_service);
+    Result OpenDisplay(Out<u64> out_display_id, DisplayName display_name);
+    Result OpenDefaultDisplay(Out<u64> out_display_id);
+    Result CloseDisplay(u64 display_id);
+    Result SetDisplayEnabled(u32 state, u64 display_id);
+    Result GetDisplayResolution(Out<s64> out_width, Out<s64> out_height, u64 display_id);
+    Result SetLayerScalingMode(NintendoScaleMode scale_mode, u64 layer_id);
+    Result ListDisplays(Out<u64> out_count,
+                        OutArray<DisplayInfo, BufferAttr_HipcMapAlias> out_displays);
+    Result OpenLayer(Out<u64> out_size, OutBuffer<BufferAttr_HipcMapAlias> out_native_window,
+                     DisplayName display_name, u64 layer_id, ClientAppletResourceUserId aruid);
+    Result CloseLayer(u64 layer_id);
+    Result CreateStrayLayer(Out<u64> out_layer_id, Out<u64> out_size,
+                            OutBuffer<BufferAttr_HipcMapAlias> out_native_window, u32 flags,
+                            u64 display_id);
+    Result DestroyStrayLayer(u64 layer_id);
+    Result GetDisplayVsyncEvent(OutCopyHandle<Kernel::KReadableEvent> out_vsync_event,
+                                u64 display_id);
+    Result ConvertScalingMode(Out<ConvertedScaleMode> out_scaling_mode, NintendoScaleMode mode);
+    Result GetIndirectLayerImageMap(
+        Out<u64> out_size, Out<u64> out_stride,
+        OutBuffer<BufferAttr_HipcMapTransferAllowsNonSecure | BufferAttr_HipcMapAlias> out_buffer,
+        s64 width, s64 height, u64 indirect_layer_consumer_handle,
+        ClientAppletResourceUserId aruid);
+    Result GetIndirectLayerImageRequiredMemoryInfo(Out<s64> out_size, Out<s64> out_alignment,
+                                                   s64 width, s64 height);
 
 private:
-    Nvnflinger::Nvnflinger& nvnflinger;
-    Nvnflinger::HosBinderDriverServer& hos_binder_driver_server;
-    std::vector<u64> stray_layer_ids;
-    bool vsync_event_fetched{false};
+    Nvnflinger::Nvnflinger& m_nvnflinger;
+    Nvnflinger::HosBinderDriverServer& m_hos_binder_driver_server;
+    std::vector<u64> m_stray_layer_ids;
+    bool m_vsync_event_fetched{false};
 };
 
 } // namespace Service::VI